Rename GdkDisplayManagerX11 to GdkX11DisplayManager

And add a gdkx11displaymanager.h header file.

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 60f5302b2c43e30c3ee9c87a76399852297f4cd8..97022d5a22521bc7710f95df409086d3ffc8089b 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -32,6 +32,10 @@
 #include "gdkmarshalers.h"
 #include "gdkintl.h"
 
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
+
 
 /**
  * SECTION:gdkdisplaymanager
@@ -147,10 +151,6 @@ gdk_display_manager_get_property (GObject      *object,
     }
 }
 
-#ifdef GDK_WINDOWING_X11
-extern GType gdk_display_manager_x11_get_type (void);
-#endif
-
 /**
  * gdk_display_manager_get:
  *
@@ -174,7 +174,7 @@ gdk_display_manager_get (void)
       backend = g_getenv ("GDK_BACKEND");
 #ifdef GDK_WINDOWING_X11
       if (backend == NULL || strcmp (backend, "x11") == 0)
-        manager = g_object_new (gdk_display_manager_x11_get_type (), NULL);
+        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
       else
 #endif
       if (backend != NULL)

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index bf33c4adae55eed413ccbcf42556ff12e0633fd1..a0489b49512d78cab47eb3f4aba7a8ef4b34a5a5 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -78,6 +78,7 @@ libgdkinclude_HEADERS =       \
 libgdkx11include_HEADERS =     \
        gdkx11cursor.h          \
        gdkx11display.h         \
+       gdkx11displaymanager.h  \
        gdkx11property.h        \
        gdkx11screen.h          \
        gdkx11selection.h       \

diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index d073c3c727c4fb437c916cc8bd1831e3149322cb..b0cd9dee3e841dc224ba9a4287cd1d9827ad9f27 100644 (file)
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -23,19 +23,14 @@
 
 #include "config.h"
 
+#include "gdkx11displaymanager.h"
+#include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"
 
-#include "gdkdisplaymanagerprivate.h"
 #include "gdkinternals.h"
 
-#define GDK_TYPE_DISPLAY_MANAGER_X11    (gdk_display_manager_x11_get_type ())
-#define GDK_DISPLAY_MANAGER_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER_X11, GdkDisplayManagerX11))
-
-typedef struct _GdkDisplayManagerX11 GdkDisplayManagerX11;
-typedef struct _GdkDisplayManagerClass GdkDisplayManagerX11Class;
-
-struct _GdkDisplayManagerX11
+struct _GdkX11DisplayManager
 {
   GdkDisplayManager parent;
 
@@ -43,65 +38,66 @@ struct _GdkDisplayManagerX11
   GSList *displays;
 };
 
-G_DEFINE_TYPE (GdkDisplayManagerX11, gdk_display_manager_x11, GDK_TYPE_DISPLAY_MANAGER)
+struct _GdkX11DisplayManagerClass
+{
+  GdkDisplayManagerClass parent_class;
+};
+
+G_DEFINE_TYPE (GdkX11DisplayManager, gdk_x11_display_manager, GDK_TYPE_X11_DISPLAY_MANAGER)
 
 static GdkDisplay *
-gdk_display_manager_x11_open_display (GdkDisplayManager *manager,
+gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
                                       const gchar       *name)
 {
   return _gdk_x11_display_open (name);
 }
 
 static GSList *
-gdk_display_manager_x11_list_displays (GdkDisplayManager *manager)
+gdk_x11_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  GdkDisplayManagerX11 *manager_x11 = GDK_DISPLAY_MANAGER_X11 (manager);
-
-  return g_slist_copy (manager_x11->displays);
+  return g_slist_copy (GDK_X11_DISPLAY_MANAGER (manager)->displays);
 }
 
 static GdkDisplay *
-gdk_display_manager_x11_get_default_display (GdkDisplayManager *manager)
+gdk_x11_display_manager_get_default_display (GdkDisplayManager *manager)
 {
-  return GDK_DISPLAY_MANAGER_X11 (manager)->default_display;
+  return GDK_X11_DISPLAY_MANAGER (manager)->default_display;
 }
 
 static void
-gdk_display_manager_x11_set_default_display (GdkDisplayManager *manager,
+gdk_x11_display_manager_set_default_display (GdkDisplayManager *manager,
                                              GdkDisplay        *display)
 {
-  GdkDisplayManagerX11 *manager_x11 = GDK_DISPLAY_MANAGER_X11 (manager);
-
-  manager_x11->default_display = display;
+  GDK_X11_DISPLAY_MANAGER (manager)->default_display = display;
 
   _gdk_x11_display_make_default (display);
 }
 
 static void
-gdk_display_manager_x11_init (GdkDisplayManagerX11 *manager)
+gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
   _gdk_x11_windowing_init ();
 }
 
 static void
-gdk_display_manager_x11_finalize (GObject *object)
+gdk_x11_display_manager_finalize (GObject *object)
 {
-  g_error ("A GdkDisplayManagerX11 object was finalized. This should not happen");
-  G_OBJECT_CLASS (gdk_display_manager_x11_parent_class)->finalize (object);
+  g_error ("A GdkX11DisplayManager object was finalized. This should not happen");
+  G_OBJECT_CLASS (gdk_x11_display_manager_parent_class)->finalize (object);
 }
 
 static void
-gdk_display_manager_x11_class_init (GdkDisplayManagerX11Class *class)
+gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);
 
-  object_class->finalize = gdk_display_manager_x11_finalize;
+  object_class->finalize = gdk_x11_display_manager_finalize;
 
-  manager_class->open_display = gdk_display_manager_x11_open_display;
-  manager_class->list_displays = gdk_display_manager_x11_list_displays;
-  manager_class->set_default_display = gdk_display_manager_x11_set_default_display;
-  manager_class->get_default_display = gdk_display_manager_x11_get_default_display;
+  manager_class->open_display = gdk_x11_display_manager_open_display;
+  manager_class->list_displays = gdk_x11_display_manager_list_displays;
+  manager_class->set_default_display = gdk_x11_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_x11_display_manager_get_default_display;
   manager_class->atom_intern = _gdk_x11_display_manager_atom_intern;
   manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
   manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
@@ -113,7 +109,7 @@ void
 _gdk_x11_display_manager_add_display (GdkDisplayManager *manager,
                                       GdkDisplay        *display)
 {
-  GdkDisplayManagerX11 *manager_x11 = GDK_DISPLAY_MANAGER_X11 (manager);
+  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
 
   if (manager_x11->displays == NULL)
     gdk_display_manager_set_default_display (manager, display);
@@ -125,7 +121,7 @@ void
 _gdk_x11_display_manager_remove_display (GdkDisplayManager *manager,
                                          GdkDisplay        *display)
 {
-  GdkDisplayManagerX11 *manager_x11 = GDK_DISPLAY_MANAGER_X11 (manager);
+  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
 
   manager_x11->displays = g_slist_remove (manager_x11->displays, display);
 

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 20d596b029c299630a5fdeebd2f1b13611ad6ffb..f496b2de69eafeee9f221dcd4738779f19cb7df0 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -57,6 +57,7 @@
 
 #include <gdk/x11/gdkx11cursor.h>
 #include <gdk/x11/gdkx11display.h>
+#include <gdk/x11/gdkx11displaymanager.h>
 #include <gdk/x11/gdkx11property.h>
 #include <gdk/x11/gdkx11screen.h>
 #include <gdk/x11/gdkx11selection.h>

diff --git a/gdk/x11/gdkx11displaymanager.h b/gdk/x11/gdkx11displaymanager.h
new file mode 100644 (file)
index 0000000..b729a04
--- /dev/null
+++ b/gdk/x11/gdkx11displaymanager.h
@@ -0,0 +1,49 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
+
+#ifndef __GDK_X11_DISPLAY_MANAGER_H__
+#define __GDK_X11_DISPLAY_MANAGER_H__
+
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+#ifdef GDK_COMPILATION
+typedef struct _GdkX11DisplayManager GdkX11DisplayManager;
+#else
+typedef GdkDisplayManager GdkX11DisplayManager;
+#endif
+typedef struct _GdkX11DisplayManagerClass GdkX11DisplayManagerClass;
+
+#define GDK_TYPE_X11_DISPLAY_MANAGER              (gdk_x11_display_manager_get_type())
+#define GDK_X11_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManager))
+#define GDK_X11_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManagerClass))
+#define GDK_IS_X11_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_DISPLAY_MANAGER))
+#define GDK_IS_X11_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY_MANAGER))
+#define GDK_X11_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManagerClass))
+
+GType      gdk_x11_display_manager_get_type            (void);
+
+G_END_DECLS
+
+#endif /* __GDK_X11_DISPLAY_MANAGER_H__ */